49ba14ab725d04bc03314521e79d490b27dbbf65,xwiki-platform-tag/plugin/application-manager/src/main/java/com/xpn/xwiki/plugin/applicationmanager/core/doc/objects/classes/DefaultXObjectDocument.java,DefaultXObjectDocument,mergeObject,#DefaultXObjectDocument#,194

Before Change


            return;
        }

        getBaseObject(true).merge(sdoc.getBaseObject(false));
    }

    /**

After Change


        }

        BaseObject obj1 = getBaseObject(true);
        BaseObject obj2 = sdoc.getBaseObject(false);

        for (Iterator it = obj1.getPropertyList().iterator(); it.hasNext();) {
            String fieldName = (String) it.next();
            Object fieldValue2 = obj2.safeget(fieldName);

            if (fieldValue2 != null) {
                obj1.safeput(fieldName, (PropertyInterface) ((BaseElement) fieldValue2).clone());
            }
        }
    }